Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make yum repo GPG key an attribute #326

Merged
merged 3 commits into from
Aug 3, 2016
Merged

Conversation

iancward
Copy link
Contributor

This fixes GH-311.

@olivielpeau
Copy link
Member

Thanks @iancward, this looks good! We'll include it in the next minor release.

@olivielpeau olivielpeau added this to the 2.5.0 milestone Jul 13, 2016
@@ -62,10 +62,14 @@
}
architecture_map.default = 'x86_64'

# Older versions of yum embed M2Crypto with SSL that doesn't support TLS1.2
prefix = node['platform_version'].to_i < 6 ? 'http' : 'https'
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

After giving it some thought, I think this deserves a more accurate condition since it will run on all platforms. Could you change this to:

yum_protocol = 'https'
if node['platform_family'] == 'rhel' && node['platform_version'].to_i < 6
  # Older versions of yum embed M2Crypto with SSL that doesn't support TLS1.2
  yum_protocol = 'http'
end

(I've also renamed prefix yum_protocol since that name makes more sense here IMO)

Copy link
Contributor Author

@iancward iancward Jul 15, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I merely migrated the code from the repository recipe, but I just noticed that it's inside of a case node['platform_family'] block.

This is fixed in 6eb91d7. I did it a bit differently to try to be more DRY.

@olivielpeau olivielpeau removed the ready label Jul 15, 2016
@olivielpeau
Copy link
Member

@iancward Just added a comment actually, let me know what you think, thanks!

@olivielpeau
Copy link
Member

Thanks @iancward, looks better now, I think this is ready for the next minor release

@irabinovitch
Copy link
Contributor

@iancward Thanks for your efforts on this PR. We're currently working through a QA/testing cycle on the next release, which we expect to include this PR.

@olivielpeau olivielpeau merged commit 07a524c into DataDog:master Aug 3, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

yum gpg key should be an attribute
3 participants